Merge tag 'upstream/3.6.1_20160216'
authorGert Wollny <gw.fossdev@gmail.com>
Sat, 9 Apr 2016 12:18:06 +0000 (12:18 +0000)
committerGert Wollny <gw.fossdev@gmail.com>
Sat, 9 Apr 2016 12:18:06 +0000 (12:18 +0000)
commit3af6c048ee4533596d10e329679a706e488490c7
treeb4d8f5f0ee69dc33de5a810c0850104bfc7a8c9a
parent091a1e5fc04fe7779865f223b79b42ad304cb690
parent4a3589f2d7d33140e6ffdbde48a601b18c75f1d4
Merge tag 'upstream/3.6.1_20160216'

Upstream version 3.6.1~20160216